Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Wed, 26 May 2010 12:12:13 +0000 (12:12 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Wed, 26 May 2010 12:12:13 +0000 (12:12 +0000)
commit73e0ce9996a8e4742c287413c77f43b3a4f43a3f
treef131eead40c814dab8ac3f617e142786c6815bef
parentf2e1b95d3ca17a71f11cd0c2f1c851618ce2125b
parent2629d94ed8b38075307271c3658d765dcf65a928
Merge from mainline.